From 8732d07260d126c24114645eae1908f503e1e2f3 Mon Sep 17 00:00:00 2001
From: Alex Crichton <alex@alexcrichton.com>
Date: Tue, 16 Sep 2014 15:11:47 -0700
Subject: [PATCH] Tweak filesystem hierarchy format

---
 src/cargo/sources/registry.rs | 15 +++++++++------
 src/etc/dl-snapshot.py        |  3 ++-
 tests/test_cargo_registry.rs  |  4 ++--
 3 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/src/cargo/sources/registry.rs b/src/cargo/sources/registry.rs
index 5503aab0c..d261b1d68 100644
--- a/src/cargo/sources/registry.rs
+++ b/src/cargo/sources/registry.rs
@@ -181,13 +181,16 @@ impl<'a, 'b> RegistrySource<'a, 'b> {
 
 impl<'a, 'b> Registry for RegistrySource<'a, 'b> {
     fn query(&mut self, dep: &Dependency) -> CargoResult<Vec<Summary>> {
-        let mut chars = dep.get_name().chars();
+        let name = dep.get_name();
         let path = self.checkout_path.clone();
-        let path = path.join(format!("{}{}", chars.next().unwrap_or(':'),
-                                     chars.next().unwrap_or(':')));
-        let path = path.join(format!("{}{}", chars.next().unwrap_or(':'),
-                                     chars.next().unwrap_or(':')));
-        let path = path.join(dep.get_name());
+        let path = match name.len() {
+            1 => path.join("1").join(name),
+            2 => path.join("2").join(name),
+            3 => path.join("3").join(name.slice_to(1)).join(name),
+            _ => path.join(name.slice(0, 2))
+                     .join(name.slice(2, 4))
+                     .join(name),
+        };
         let contents = match File::open(&path) {
             Ok(mut f) => try!(f.read_to_string()),
             Err(..) => return Ok(Vec::new()),
diff --git a/src/etc/dl-snapshot.py b/src/etc/dl-snapshot.py
index cb7748611..9b38ad636 100644
--- a/src/etc/dl-snapshot.py
+++ b/src/etc/dl-snapshot.py
@@ -25,7 +25,8 @@ elif triple == 'i686-apple-darwin':
     me = mac32
 elif triple == 'x86_64-apple-darwin':
     me = mac64
-elif triple == 'i686-pc-mingw32':
+elif triple == 'i686-w64-mingw32':
+    triple = 'i686-pc-mingw32'
     me = win32
 elif triple == 'x86_64-w64-mingw32':
     triple = 'i686-pc-mingw32'
diff --git a/tests/test_cargo_registry.rs b/tests/test_cargo_registry.rs
index 1a148a50e..f47d3a154 100644
--- a/tests/test_cargo_registry.rs
+++ b/tests/test_cargo_registry.rs
@@ -45,8 +45,8 @@ fn setup() {
         .file("config.json", format!(r#"
             {{"dl":"{}","upload":""}}
         "#, dl_url()).as_slice())
-        .file("fo/o:/foo", pkg("foo", "0.0.1", [], &foo_cksum))
-        .file("ba/r:/bar", pkg("bar", "0.0.1", ["foo|>=0.0.0"], &bar_cksum))
+        .file("3/f/foo", pkg("foo", "0.0.1", [], &foo_cksum))
+        .file("3/b/bar", pkg("bar", "0.0.1", ["foo|>=0.0.0"], &bar_cksum))
         .file("ba/d-/bad-cksum", pkg("bad-cksum", "0.0.1", [], &bar_cksum))
         .nocommit_file("no/ty/notyet", pkg("notyet", "0.0.1", [], &notyet))
         .build();
-- 
2.30.2